Fix memory leak on error return of collation callback in pdo_sqlite #18332
+1
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We should destroy it when it's not IS_LONG, not when it's IS_LONG.
| return FAILURE; | ||
| } | ||
| if (Z_LVAL(retval) > 0) { | ||
| ret = 1; | ||
| } else if (Z_LVAL(retval) < 0) { | ||
| ret = -1; | ||
| } | ||
| zval_ptr_dtor(&retval); |
There was a problem hiding this comment.
Wouldn’t it leak if it’s not a LONG?
There was a problem hiding this comment.
This code path is only taken if it is a LONG. If it's not a long, the above code path is taken with the return FAILURE;. We therefore have to dtor the zval in the above path.
There was a problem hiding this comment.
Oh, my bad. I meant the case when it’s LONG — that was a typo.
There was a problem hiding this comment.
a LONG is not refcounted, so zval_ptr_dtor is a no-op on that.
There was a problem hiding this comment.
I didn’t know much about that, thanks!
SakiTakamachi
approved these changes
Apr 16, 2025
|
Ah, no. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We should destroy it when it's not IS_LONG, not when it's IS_LONG.